Auto merge of #1117 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 2 Jan 2015 21:41:12 +0000 (21:41 +0000)
committerbors <bors@rust-lang.org>
Fri, 2 Jan 2015 21:41:12 +0000 (21:41 +0000)

Trivial merge